(smerge-remove-props): Don't mark the buffer modified.
authorStefan Monnier <monnier@iro.umontreal.ca>
Thu, 8 Mar 2007 20:12:55 +0000 (20:12 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Thu, 8 Mar 2007 20:12:55 +0000 (20:12 +0000)
commit7503daf484bfec0b3c66b0beb5cfc689e66415a6
treebad4df5cccc399796eaca6773e4b54b4301e437a
parent8f726675d12577f091918ec595450d04124ee543
(smerge-remove-props): Don't mark the buffer modified.
(debug-ignored-errors): Add entry from smerge-match-conflict.
lisp/ChangeLog
lisp/smerge-mode.el